From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Tue, 5 Dec 2017 22:04:24 +0000 (-0500)
Subject: dash: Do not shadow ClutterActor's destroy()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~994^2^2~138
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=74683b7ef7ba10a82db488aa4d79290d8efdfc81;p=gnome-shell.git

dash: Do not shadow ClutterActor's destroy()

Since commit ef1e27966db2 turned DashItemContainer into an StWidget,
the destroy() method overrides the ClutterActor method, which is at
the very least bad style. Instead, follow the usual pattern of using
a ::destroy handler.

https://bugzilla.gnome.org/show_bug.cgi?id=791233
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index b89040bb6..43b7c4450 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -50,6 +50,10 @@ var DashItemContainer = new Lang.Class({
         this._childScale = 0;
         this._childOpacity = 0;
         this.animatingOut = false;
+
+        this.connect('destroy', () => {
+            this.label.destroy();
+        });
     },
 
     vfunc_allocate: function(box, flags) {
@@ -177,11 +181,6 @@ var DashItemContainer = new Lang.Class({
                          });
     },
 
-    destroy: function() {
-        this.label.destroy();
-        this.parent();
-    },
-
     animateOutAndDestroy: function() {
         this.label.hide();